refactor main window stacked widget by Robert0Mart · Pull Request #298 · BlocksTechnology/BlocksScreen

Robert0Mart · 2026-08-13T09:07:26Z

Descritpion

Refactor

BlocksScreen/lib/panels/mainWindow.py

Added setup UI

BlocksScreen/lib/panels/widgets/MainWindow/cancelPage.py
BlocksScreen/lib/panels/widgets/MainWindow/connectionPage.py
BlocksScreen/lib/panels/widgets/MainWindow/notificationPage.py
BlocksScreen/lib/panels/widgets/MainWindow/updatePage.py

organized files into they own folder

BlocksScreen/lib/ui/mainWindow.ui
BlocksScreen/lib/ui/mainWindow_ui.py
BlocksScreen/lib/ui/mainWindow_v2.ui
BlocksScreen/lib/ui/mainWindow_v2_ui.py

deleted unused files after refactor

tests/panels/conftest.py

stop stale lib.utils stub leaking from tests/lib, breaking mainWindow test collection

tests/panels/test_main_window_unit.py

fix test fixture: main_content_widget/printTab read flat off self, not self.ui

scripts/requirements-dev.txt

added missing numpy dependency

gmmcosta15

What's good

Drops the generated mainWindow.ui/mainWindow_ui.py plus the unused mainWindow_v2 pair (~2.5k lines).
Every self.ui.* reference in mainWindow.py is converted, and no other module reaches into the old Ui_MainWindow.
The four page moves into widgets/MainWindow/ are 100% renames, and every importer (mainWindow.py, tests/panels/conftest.py, test_update_page_unit.py, test_connection_page.py) is updated in the same PR.
_setup_ui() runs before any widget is used and currentChanged is connected after it, so the temporary setCurrentIndex(3) fires no slot.
It sets the _setup_ui pattern the rest of the stack (#299-#332) follows.
All 20 resource keys in _setup_ui resolve on dev.

1. mainWindow.py:1273: _setup_ui is pyuic output moved into a linted file
BlocksScreen/lib/ui is excluded from ruff (exclude) and pylint (ignore-paths). lib/panels/ is not, so these ~420 generated lines now count against the pylint score: one method with ~250 statements trips R0915 (too-many-statements) and R0914 (too-many-locals), and mainWindow.py grows to ~1690 lines. Split it by region so each piece is readable and under the limits:

def _setup_ui(self) -> None:
    """Build header bar, tab widget and tab pages."""
    self._setup_window()
    self._setup_tabs()
    self._setup_header()
    self.setCentralWidget(self.main_widget)

2. mainWindow.py:1373-1496: the four tab blocks are the same 31 lines with different names
A factory removes ~90 lines. Two quirks to keep: controlTab alone uses a 720 base width, and the filament disabled icon is really named ICON_filamente_blocked.png, so pass the blocked path explicitly or rename the resource:

def _make_tab(self, name: str, stem: str, blocked: str) -> QtWidgets.QWidget:
    tab = QtWidgets.QWidget()
    tab.setObjectName(name)
    tab.setMinimumSize(720, 420)
    tab.setMaximumSize(1024, 720)
    icon = QtGui.QIcon()
    base = ":/icons/media/main_menu/"
    icon.addPixmap(QtGui.QPixmap(f"{base}{stem}.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off)
    icon.addPixmap(QtGui.QPixmap(f"{base}{stem}_pressed.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.On)
    icon.addPixmap(QtGui.QPixmap(f"{base}{blocked}"), QtGui.QIcon.Mode.Disabled, QtGui.QIcon.State.On)
    self.main_content_widget.addTab(tab, icon, "")
    return tab

self.printTab = self._make_tab("printTab", "ICON_home", "ICON_home_blocked.png")

3. mainWindow.py:1663-1694: _translate wraps internal property keys
No QTranslator is installed anywhere, so _translate does nothing. Also, button_type, name and display_format are keys the paint code switches on, not user text. Routing them through translation means a future .qm could break rendering. Set them directly:

self.extruder_temp_display.setProperty("button_type", "secondary_display")
self.chamber_temp_display.setProperty("display_format", "dual")

4. mainWindow.py:1303-1305: stylesheet that does not parse
"MainWindow > {\n url(...Momcake-Thin.ttf);\n}" has no selector after > and no property before url(...), so Qt logs a parse warning on every start. It was dead in the .ui too. Now that it's hand-written code, delete it. setWindowTitle("MainWindow") and QIcon.fromTheme("applications-other") do nothing on a frameless kiosk either.

# delete the self.setStyleSheet("MainWindow > ...") call

5. mainWindow.py:1695: dead writes inside _setup_ui
setCurrentIndex(3) is overwritten by setCurrentIndex(0) at :143. The "Filament" / "nozzle" placeholder texts are overwritten by "PLA" / "0.4mm" at :228-231. Set each value once, in _setup_ui:

self.filament_type_icon.setText("PLA")
self.nozzle_size_icon.setText("0.4mm")

6. mainWindow.py:1307-1343: layout hints on widgets that have no layout
main_content_widget and main_header_layout are placed with setGeometry on a main_widget that has no layout. setSizePolicy, stretch, setSizeIncrement and setBaseSize do nothing there, and the last two only apply to top-level windows. Keep the min/max clamps and drop the rest:

self.main_content_widget.setGeometry(QtCore.QRect(0, 60, 800, 420))
self.main_content_widget.setMinimumSize(800, 400)
self.main_content_widget.setMaximumSize(1024, 720)

7. widgets/MainWindow/: new package has no __init__.py
Both lib/panels/ and lib/panels/widgets/ are regular packages, but this one is an implicit namespace package. The same applies to the folders the rest of the stack adds (Common, ControlTab, FilamentTab, PrintTab, UtilitiesTab), so one commit with six empty __init__.py files covers them all. PEP 8 prefers lowercase package names, optional since the whole stack uses PascalCase.

# BlocksScreen/lib/panels/widgets/MainWindow/__init__.py
"""Main-window overlay pages: cancel, connection, notification, update."""

8. mainWindow.py:26-30: imports are interleaved
isort sorts case-sensitively, so the MainWindow.* imports group before basePopup. The default ruff selection has no I, so CI won't flag it, but ruff check --select I --fix will:

from lib.panels.widgets.MainWindow.cancelPage import CancelPage
from lib.panels.widgets.MainWindow.connectionPage import ConnectionPage
from lib.panels.widgets.MainWindow.notificationPage import NotificationPage
from lib.panels.widgets.MainWindow.updatePage import UpdatePage
from lib.panels.widgets.basePopup import BasePopup
from lib.panels.widgets.loadWidget import LoadingOverlayWidget

9. scripts/requirements-dev.txt:10: second copy of the numpy==2.1.0 pin
scripts/requirements.txt:5 already pins it (for blocks_Scrollbar.py). Two copies will drift, include the runtime file instead:

-r requirements.txt

10. tests/panels/conftest.py:21-23: global purge of every lib.* module
This runs at collection time and also evicts real modules that other test directories already imported in the same xdist worker. Any later string patch such as patch("lib.utils.x.Y") re-imports a fresh copy and patches that copy instead of the one the test holds. The comment names the real culprit (tests/lib/conftest.py leaking a bare MagicMock for lib.utils), so fix the leak there:

# tests/lib/conftest.py
@pytest.fixture(autouse=True)
def _lib_utils_stub(monkeypatch):
    monkeypatch.setitem(sys.modules, "lib.utils", MagicMock())

11. tests/panels/conftest.py:52,104: stub left for a deleted module
lib.ui.mainWindow_ui / Ui_MainWindow are still stubbed, but this PR deletes that module:

# drop "lib.ui.mainWindow_ui" from _STUB_MODULES and the Ui_MainWindow assignment

## Stacked PR — merge order This PR is stacked on top of: 1. #298 2. #299 **Do not merge until #298 and #299 are merged first.** CI won't run here until the base becomes `dev` (after the parents merge). ## Description - [x] Refactor **BlocksScreen/lib/panels/filamentTab.py** - aligned main button to the rest of the tabs - updated import **BlocksScreen/lib/panels/widgets/FilamentTab/addFilamentPage.py** **BlocksScreen/lib/panels/widgets/FilamentTab/addSpoolPage.py** **BlocksScreen/lib/panels/widgets/FilamentTab/amuPage.py** **BlocksScreen/lib/panels/widgets/FilamentTab/amuWidgets.py** **BlocksScreen/lib/panels/widgets/FilamentTab/basicFilamentPanel.py** **BlocksScreen/lib/panels/widgets/FilamentTab/spoolmanPage.py** - moved pages to their own folder for better organisation **BlocksScreen/lib/ui/filamentSensorsPage.ui** **BlocksScreen/lib/ui/filamentSensorsPage_ui.py** **BlocksScreen/lib/ui/filamentStackedWidget.ui** **BlocksScreen/lib/ui/filamentStackedWidget_ui.py** - deleted unused ui files

## Stacked PR — merge order This PR is stacked on top of: 1. #298 2. #299 **Do not merge until #298 and #299 are merged first.** CI won't run here until the base becomes `dev` (after the parents merge). ## Description - [x] refactor **BlocksScreen/lib/panels/printTab.py** - updated paths **BlocksScreen/lib/panels/widgets/PrintTab/babystepPage.py** **BlocksScreen/lib/panels/widgets/PrintTab/confirmPage.py** **BlocksScreen/lib/panels/widgets/PrintTab/filesPage.py** **BlocksScreen/lib/panels/widgets/PrintTab/jobStatusPage.py** **BlocksScreen/lib/panels/widgets/PrintTab/sensorsPanel.py** **BlocksScreen/lib/panels/widgets/PrintTab/sensorWidget.py** **BlocksScreen/lib/panels/widgets/PrintTab/tunePage.py** - organized pages into a single folder **BlocksScreen/lib/ui/printStackedWidget.ui** **BlocksScreen/lib/ui/printStackedWidget_ui.py** - deleted unused UI files

@gmmcosta15

…etup (#315) ## Stacked PR — merge order This PR is stacked on top of: 1. #298 2. #299 **Do not merge until #298 and #299 are merged first.** CI won't run here until the base becomes `dev` (after the parents merge). ## Description - [x] refactor - organized the rest of the widgets into a common folder - standardized setup UI cross files - updated tests based on the changes (paths and comments) by : @gmmcosta15 # File architecture - lib/panels/ : mainWindow.py, controlTab.py, filamentTab.py, printTab.py, utilitiesTab.py, networkWindow.py - lib/panels/widgets/ - bannerPopup.py - common/ : basePopup.py, popupDialogWidget.py, keyboardPage.py, numpadPage.py, slider_selector_page.py, loadWidget.py, optionCardWidget.py - ControlTab/ : axisPage.py, extruderPage.py, fansPage.py, printcorePage.py, probeHelperPage.py, temperaturePage.py - FilamentTab/ : addFilamentPage.py, addSpoolPage.py, colorWheelWidget.py, amuPage.py, amuWidgets.py, basicFilamentPanel.py, spoolmanPage.py - MainWindow/ : cancelPage.py, connectionPage.py, notificationPage.py, updatePage.py - PrintTab/ : babystepPage.py, confirmPage.py, filesPage.py, jobStatusPage.py, sensorsPanel.py, sensorWidget.py, tunePage.py - UtilitiesTab/ : inputshaperPage.py, troubleshootPage.py

## Stacked PR — merge order This PR is stacked on top of: 1. #298 2. #299 **Do not merge until #298 , #299 are merged first.** CI won't run here until the base becomes `dev` (after the parents merge). ## Descirption - [x] Refactor ### Separated utitliesStacked.ui into pages - BlocksScreen/lib/panels/widgets/UtilitiesTab/InputShaPage.py - BlocksScreen/lib/panels/widgets/UtilitiesTab/axisMaintPage.py - BlocksScreen/lib/panels/widgets/UtilitiesTab/infoPage.py - BlocksScreen/lib/panels/widgets/UtilitiesTab/ledsPage.py - BlocksScreen/lib/panels/widgets/UtilitiesTab/routinePage.py - BlocksScreen/lib/panels/widgets/UtilitiesTab/troubleshootPage.py (cleaned setupUi) ### deleted old UI - BlocksScreen/lib/ui/utilitiesStackedWidget.ui - BlocksScreen/lib/ui/utilitiesStackedWidget_ui.py

## Description - [x] fix ### Changes address reviews on other pr of this stacked PR #298 #299 #302 #303 #315 #332 --------- Co-authored-by: Robert0Mart <robertomicael.martins@gmail.com>

## Stacked PR — merge order This PR is stacked on top of: 1. #298 2. #299 **Do not merge until #298 and #299 are merged first.** CI won't run here until the base becomes `dev` (after the parents merge). ## Description - [x] Refactor **BlocksScreen/lib/panels/filamentTab.py** - aligned main button to the rest of the tabs - updated import **BlocksScreen/lib/panels/widgets/FilamentTab/addFilamentPage.py** **BlocksScreen/lib/panels/widgets/FilamentTab/addSpoolPage.py** **BlocksScreen/lib/panels/widgets/FilamentTab/amuPage.py** **BlocksScreen/lib/panels/widgets/FilamentTab/amuWidgets.py** **BlocksScreen/lib/panels/widgets/FilamentTab/basicFilamentPanel.py** **BlocksScreen/lib/panels/widgets/FilamentTab/spoolmanPage.py** - moved pages to their own folder for better organisation **BlocksScreen/lib/ui/filamentSensorsPage.ui** **BlocksScreen/lib/ui/filamentSensorsPage_ui.py** **BlocksScreen/lib/ui/filamentStackedWidget.ui** **BlocksScreen/lib/ui/filamentStackedWidget_ui.py** - deleted unused ui files

This PR is stacked on top of: 1. #298 2. #299 **Do not merge until #298 and #299 are merged first.** CI won't run here until the base becomes `dev` (after the parents merge). - [x] refactor **BlocksScreen/lib/panels/printTab.py** - updated paths **BlocksScreen/lib/panels/widgets/PrintTab/babystepPage.py** **BlocksScreen/lib/panels/widgets/PrintTab/confirmPage.py** **BlocksScreen/lib/panels/widgets/PrintTab/filesPage.py** **BlocksScreen/lib/panels/widgets/PrintTab/jobStatusPage.py** **BlocksScreen/lib/panels/widgets/PrintTab/sensorsPanel.py** **BlocksScreen/lib/panels/widgets/PrintTab/sensorWidget.py** **BlocksScreen/lib/panels/widgets/PrintTab/tunePage.py** - organized pages into a single folder **BlocksScreen/lib/ui/printStackedWidget.ui** **BlocksScreen/lib/ui/printStackedWidget_ui.py** - deleted unused UI files

@gmmcosta15

…etup (#315) This PR is stacked on top of: 1. #298 2. #299 **Do not merge until #298 and #299 are merged first.** CI won't run here until the base becomes `dev` (after the parents merge). - [x] refactor - organized the rest of the widgets into a common folder - standardized setup UI cross files - updated tests based on the changes (paths and comments) by : @gmmcosta15 - lib/panels/ : mainWindow.py, controlTab.py, filamentTab.py, printTab.py, utilitiesTab.py, networkWindow.py - lib/panels/widgets/ - bannerPopup.py - common/ : basePopup.py, popupDialogWidget.py, keyboardPage.py, numpadPage.py, slider_selector_page.py, loadWidget.py, optionCardWidget.py - ControlTab/ : axisPage.py, extruderPage.py, fansPage.py, printcorePage.py, probeHelperPage.py, temperaturePage.py - FilamentTab/ : addFilamentPage.py, addSpoolPage.py, colorWheelWidget.py, amuPage.py, amuWidgets.py, basicFilamentPanel.py, spoolmanPage.py - MainWindow/ : cancelPage.py, connectionPage.py, notificationPage.py, updatePage.py - PrintTab/ : babystepPage.py, confirmPage.py, filesPage.py, jobStatusPage.py, sensorsPanel.py, sensorWidget.py, tunePage.py - UtilitiesTab/ : inputshaperPage.py, troubleshootPage.py

## Stacked PR — merge order This PR is stacked on top of: 1. #298 2. #299 **Do not merge until #298 , #299 are merged first.** CI won't run here until the base becomes `dev` (after the parents merge). ## Descirption - [x] Refactor ### Separated utitliesStacked.ui into pages - BlocksScreen/lib/panels/widgets/UtilitiesTab/InputShaPage.py - BlocksScreen/lib/panels/widgets/UtilitiesTab/axisMaintPage.py - BlocksScreen/lib/panels/widgets/UtilitiesTab/infoPage.py - BlocksScreen/lib/panels/widgets/UtilitiesTab/ledsPage.py - BlocksScreen/lib/panels/widgets/UtilitiesTab/routinePage.py - BlocksScreen/lib/panels/widgets/UtilitiesTab/troubleshootPage.py (cleaned setupUi) ### deleted old UI - BlocksScreen/lib/ui/utilitiesStackedWidget.ui - BlocksScreen/lib/ui/utilitiesStackedWidget_ui.py

## Description - [x] fix ### Changes address reviews on other pr of this stacked PR #298 #299 #302 #303 #315 #332 --------- Co-authored-by: Robert0Mart <robertomicael.martins@gmail.com>

Robert0Mart added the Refactor Enhancing code's readability, maintainability, and extensibility while addressing technical debt. label Aug 13, 2026

Robert0Mart force-pushed the ref/mainwindow-stackedwidget branch from 90444fa to 0c5b070 Compare August 13, 2026 14:14

Robert0Mart requested a review from HugoCLSC August 13, 2026 16:46

Robert0Mart marked this pull request as ready for review August 13, 2026 16:46

This was referenced Sep 7, 2026

refactor: organized pages #303

Merged

Refator: filament tab pages organisation #302

Merged

refactor: reorganize panel/widget file structure and standardize UI setup #315

Merged

feat: separated utilities ui into pages #332

Merged

gmmcosta15 self-requested a review September 23, 2026 08:46

gmmcosta15 reviewed Sep 23, 2026

View reviewed changes

RobeMartins force-pushed the ref/mainwindow-stackedwidget branch 3 times, most recently from 9710137 to 9e77740 Compare September 28, 2026 10:03

RobeMartins mentioned this pull request Sep 28, 2026

fix: address stacked widget review across tabs #338

Merged

1 task done

Robert0Mart added 8 commits September 28, 2026 12:12

Refactor: separated mainwindow widget

e3703f7

refactor: otimized setupUI

45abdcd

del : delerted copied files

79c6bed

upd: updated test

57e95f0

upd : updated test

defef52

fix: stop lib.utils stub leak breaking mainWindow tests

0440208

add :added missing requirement

e8912bc

fix : brought back dev cancel page

e8dc14a

RobeMartins force-pushed the ref/mainwindow-stackedwidget branch from 9e77740 to e8dc14a Compare September 28, 2026 11:20

fix(cancelPage): restore #291 thumbnail logic lost in stack rebase

f7f2dd1

gmmcosta15 added a commit that referenced this pull request Sep 28, 2026

chore(merge): absorb #298 squash, keep #291 cancelPage thumbnail logic

61d2ba6

gmmcosta15 merged commit 6f49d55 into dev Sep 28, 2026
8 checks passed

gmmcosta15 deleted the ref/mainwindow-stackedwidget branch September 28, 2026 12:03

gmmcosta15 added a commit that referenced this pull request Sep 28, 2026

chore(merge): absorb #298 squash into stack

16d91c8

Navigation Menu

refactor main window stacked widget - #298

refactor main window stacked widget#298
gmmcosta15 merged 9 commits into
devfrom
ref/mainwindow-stackedwidget

Robert0Mart commented Aug 13, 2026 •

edited

Loading

Uh oh!

gmmcosta15 left a comment •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

Robert0Mart commented Aug 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Descritpion

Uh oh!

gmmcosta15 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Robert0Mart commented Aug 13, 2026 •

edited

Loading

gmmcosta15 left a comment •

edited

Loading